Fixed a display problem with modifiers
asd
Merge branch 'master' into gh-pages