commit by xaelis using genmymodel: v20140828_090820