Merge pull request #12 from ritwikd/build

Build
Merge pull request #13 from ritwikd/build

Stuff.
Merge pull request #14 from ritwikd/master

Test