better GUI for custom and some bug fixed
Merge branch 'master' into gh-pages