Merge branch 'release/1.1.0' into develop
Merge pull request #2 from jadb/develop

DRY refactor.