Fixed #83
Merged stable, 2b91458