Refactoring code
Merge branch 'develop' into test-branch
Refactoring code
Merge pull request #8 from engagepoint/test-branch

test-branch