Merge pull request #7 from boegel/fixes

fix more minor issues
more style fixes