Fixes #16
Merge branch 'Messages-16'