Merge pull request #1 from mstephenmsmith/master

updates
Merge pull request #1 from zipfian/master

Merge pull request #1 from mstephenmsmith/master