merge earlier changes to master branch to TDD