Merge pull request #187 from ngoldman/master

v0.1.3
revert garbage from smushit