#484 fixed failing tests
Merge pull request #486 from adamralph/484

#484 fixed failing tests