Merge pull request #48 from mrniranjan/master

Fixes #47
Merge pull request #49 from gsr-shanks/dev

Dev
Merge remote-tracking branch 'upstream/master'