Trailing whitespace; improved spec.
Merge branch 'develop'
Version bump.