Core\Bootstrap unify syntax
Merge pull request #151 from nizsheanez/bootstrap_cleanup

Core\Bootstrap unify syntax