Fixes to make this build on Ubuntu 12.04
Merge pull request #5 from ejbs/master

Fixes to make this build on Ubuntu 12.04