hopefully this isn't f'd up
Merge pull request #7 from AndersEverett/anders_sh

hopefully this isn't f'd up