R1:c3cc333e15e3

Merge pull request #67 from cheecheeo/master

Better support for installing on Ubuntu.