Pushing to master - adopting trunk based development

Test-Driven Development