bug fix
new function
Merge branch 'integration' of github.com:mpchua/test_repo into development