some code corrections
Merge pull request #55 from Ol-li/master

some code corrections