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

Fixes#3 WIP