minor fixes
updated re-define version, custom templates
bumped version
merge ...