@dsaff 

I've spent quite a bit of time yesterday trying to learn quite a bit more about Git especially surrounding merging and rebasing. 

I'm currently running two branches on my fork,`master` and `issue45`. I rebased my `master` to get all the most recent changes. I tried various different merges and rebases for my `issue45` branch. While that got the code base up-to-date it made the pull request contain 60-80 commits.

If you prefer I can close this pull request. Re-create my work, and submit a new pull.

I would think there is a Git solution, but I haven't stumbled upon it yet.