all tests now pass
Merge pull request #48 from andrewjpage/make_tests_pass

all tests now pass
pull from upstream master