Version 1.1.0 - Snapshot
Merge github/master