Update to master. Take 2 ;)