Merge crcowan's changes
Merge branch 'crcowan-master'