Issue 1
Merge pull request #1 from jeszytanada/dev_1.0

Issue 1