merge conflict
Merge branch 'Issue496' of github.com:acquaman/acquaman into Issue496
Fixes made during testing.