Merge ISSUE-7 into Master

This merge request is related to issue #7.