Issue #28 and #26
Merge pull request #29 from gorbin/dev

Issue #28 and #26