commit by jtrentes using genmymodel: v20140626_122147