Merge pull request #20 from jvkumar/3

Fixes#3
Fixes#3 WIP