Merge pull request #7 from jvkumar/3

Fixes#3 WIP
Fixes#3 WIP