Pr 155 take2

update pr/155 to be up to date with master
i ran the tests and all passed