small bug fixes
Merge pull request #35 from Lundar/master

small bug fixes