Fix issues with source install
Merge pull request #5 from ejima/master

Fix issues with source install