update code according to discussion in pull request https://github.com/concrete5/concrete5/pull/535
update code according to discussion in pull request https://github.com/concrete5/concrete5/pull/535

Former-commit-id: 279d16176ad146a8cde0380f729a20373db94502
jaromirdalecky/concrete5,deek87/concrete5,MrKarlDilkington/concrete5,MrKarlDilkington/concrete5,biplobice/concrete5,KorvinSzanto/concrete5,haeflimi/concrete5,KorvinSzanto/concrete5,KorvinSzanto/concrete5,mlocati/concrete5,rikzuiderlicht/concrete5,mlocati/concrete5,triplei/concrete5-8,mlocati/concrete5,a3020/concrete5,acliss19xx/concrete5,biplobice/concrete5,hissy/concrete5,triplei/concrete5-8,deek87/concrete5,acliss19xx/concrete5,jaromirdalecky/concrete5,mainio/concrete5,mlocati/concrete5,mainio/concrete5,jaromirdalecky/concrete5,hissy/concrete5,rikzuiderlicht/concrete5,hissy/concrete5,biplobice/concrete5,a3020/concrete5,haeflimi/concrete5,mainio/concrete5,deek87/concrete5,biplobice/concrete5,olsgreen/concrete5,haeflimi/concrete5,olsgreen/concrete5,concrete5/concrete5,concrete5/concrete5,deek87/concrete5,haeflimi/concrete5,MrKarlDilkington/concrete5,hissy/concrete5,concrete5/concrete5,acliss19xx/concrete5,triplei/concrete5-8,olsgreen/concrete5,concrete5/concrete5,jaromirdalecky/concrete5,rikzuiderlicht/concrete5