Issue 274
merged branch xdecock/issue_274 (PR #284)

This PR was squashed before being merged into the master branch (closes #284).

Commits
-------

162971f Issue 274

Discussion
----------

Issue 274

Solves the bug#274
tweaked previous merge