Feature/generators 20131122