Fixed 201-1
Merge pull request #205 from jcadek/master

Fixed 201-1