Merge pull request #14 from ritwikd/master

Test
Merge pull request #15 from ritwikd/master

Merging in latest changes.
Merge pull request #16 from ritwikd/build

Build