test
test
test
Merge pull request #12 from bmoyles/master

Fixes for aminator #158 and #159