Resolves issue #30 (closed) and #22 (closed)
approved this merge request
merged
mentioned in commit 140be4d5