commit by genmymodel from www.genmymodel.com: v20130808_180620