exclude subdirs in plugin directory
optimise line parameter parsing 

use substring instead of componentsSeparatedByString
Merge branches 'htmlplugin' and 'menu-links'