Merge pull request #5 from ritwikd/build

Merge pull request #4 from ritwikd/master
Merge pull request #6 from ritwikd/master

Merge pull request #5 from ritwikd/build