Sunday

new to git and only wan to merge this into the forked version. Very sorry if this pull request ends up going to you Sacha.