Fixes#3 WIP
Merge pull request #8 from jvkumar/3

Fixes#3 WIP