Ayotte, Fixes #489
Merge pull request #553 from evonfriedland/master

Ayotte, Fixes #489