cleaned up
Merge pull request #43 from yatsdev/cleaned

cleaned up