Issue #152
Merge pull request #153 from MarcQueralt/master

Issue #152