Update master to latest code. Add missing capability

Hi Aleks. I've tidied up a little :)

We need to move this repo to the ULCC account. Could you merge this pull request, then transfer ownership in the settings, please? I'll make it accessible to you and you can then fork it so you get it back. This is to simplify the pull request workflow for others.