Fixed failing test related to commit #81
Merge pull request #82 from jpav/master

Fixed failing test related to commit #81