Seventeenth issue
Merge pull request #3 from matimatik/master

Seventeenth issue