Merge branch 'master' of github.com:nathanielherman/sto-stamp
Merge branch 'master' of github.com:nathanielherman/sto-stamp