Merge pull request #1 from mstephenmsmith/master

updates