Sunday Morning
Merge from github contributions from john.