some cleanup
Merge pull request #318 from nelenkov/dev

some cleanup