Committing latest set of changes from Theme Extender
Release 0.50.0