Fixed #150
Merge pull request #170 from adivspan/master

Fixed #150