Changes proposed in this merge request:
This merge request, when approved, will close issue/bug: #234 (closed)