iron out the flow more
Merge remote-tracking branch 'steve/master'