cleanup
Merge pull request #52 from kurunt/dev

cleanup