Merge pull request #13 from jvkumar/3

Fixes#3 WIP
Fixes#3 WIP