Merge pull request #128 from kkasravi/master

Fixes #127
Fixes #103