Pull request, as discussed

I hope this is the right order. Or does it have to be gitMarky:master ... tyronx:master?