Merge branch 'release-1.1.6' into develop
Reorganize functions for more logical flow
Add tests
Merge branch 'develop'
Add tests