Merge branch 'develop'
refactoring and adding a test
Merge branch 'master' into develop