fix more errors
Merge pull request #2 from MarcDiethelm/master

fix more errors