cleanup
Merge pull request #82 from kurunt/dev

cleanup