Fixed #50
Merge pull request #52 from raph1/master

Fixed #50