commit by genmymodel from www.genmymodel.com: v20131018_090902