Major rework.
Bumping revision to 1.1
Merge branch 'master' into release