Clean up
Merge pull request #5 from eklavya/master

Clean up