cleaned up some stuff
Merge pull request #26 from Korovyov/master

cleaned up some stuff