cleaned up
Merge pull request #45 from yatsdev/cleaned2

cleaned up