Cleanup code
Fix regression
Merge pull request #54 from sergeyklay/fix-cleanup

Cleanup code