cleanup
Merge pull request #135 from vomikan/master

cleanup