Resolved 201-3
Merge pull request #207 from jcadek/master

Resolved 201-3