Changes made in origin since fork

Pulling changes to origin into my fork, so I can write tests for issue #99