issue #22
resolving conflict merge #22
Merge pull request #26 from visminer/issue-22-m22

Issue 22 m22