Fixes  #157
Merge pull request #158 from remibantos/master

Fixes  #157 - closed