Pull request master injac

Hi Greg,

here is the pull request you asked for on Twitter  :)

Thank you again for this awesome piece of work!

Ilija