some fixes
Merge pull request #40 from cheesie67/master

some fixes