cleaned up
Merge pull request #566 from abhinavc/master

cleaned up