Small amendments to your PR

This is something I've never done before, but theoretically, it should work. I created this PR to be able to add some more commits to your work. Once we merge this, it should automatically apply to your existing PR against my development branch on the original repository. 

Please don't merge it yet. Infact, I will close this PR once I see that it's working and only reopen it, once I'm done adding commits.

Let's see if this works the way I think it does. ;-)