cleanup
Merge pull request #86 from kurunt/dev

cleanup