Merge pull request #6 from timmattison/more-complete-testing

More complete testing
Merge remote-tracking branch 'origin/master' into issue-4-shift-translation