now with passing tests
Merge pull request #833 from mjallday/master

now with passing tests