Refactor and simplify.
Bumped to 1.1.0
Merge branch 'release/1.1.0'
Merge tag '1.1.0' into develop

Version 1.1.0