Fixed #95
Merge pull request #96 from Jaspur/master

Fixed #95