Merge pull request #101 from sebix/tested-on-trusty