cleanup
Merge pull request #77 from vomikan/master

cleanup