Merge pull request #29 from stevengill/pinning