All tasks of issue #10 have been implemented.
Merge branch 'issue_10'