commit by xaelis using genmymodel: v20140826_080659