Merge pull request #1 from ameetrivedi/master

Fixed the errors
Merge pull request #1 from emeryberger/master

Merge pull request #1 from ameetrivedi/master