Back into production...
Merge pull request #2 from sunnyratilal/unit-tests

Back into production...