Sushant's changes
Merge pull request #9 from Aplopio/cleanup

Sushant's changes