Fixes #141
Fixes #140
Bootstrapper moved to constructor injection
Master template localization added