Updated 4th Sep 2016 - Generators are working again :)