Merge pull request #5 from ecsoftware/sprint0

From prabhu; email: prabhu0023@gmail.com