changes to get everything working
Merge pull request #4 from bohnje/master

changes to get everything working