Merge pull request #8 from four04/master

Some fixes for my installation
Test