commit by xaelis using genmymodel: v20140711_181955