Merge pull request #1 from foss-np/master

fix #13
Merge pull request #16 from krazedkrish/master

Merge pull request #1 from foss-np/master