Merge pull request #10 from jvkumar/3

Fixes #3 WIP