small bug fixes
Merge pull request #372 from dennishendriksen/master

Small bug fixes