Fixed #53
Merge remote-tracking branch 'sbellem/issue-53'