Updating fork from MASTER

blame @AaronBClark and @OliverGtz if something went wrong