cleaning up
Merge pull request #21 from yatsdev/cleaning

cleaning up