cleanup (seems bug:379 fixed)
Merge pull request #53 from vomikan/master

cleanup (seems bug:379 fixed)