Fixed 201-2
Merge pull request #204 from jcadek/master

Fixed 201-2