cleanup
Merge pull request #119 from kurunt/dev

cleanup