Merge branch 'shaopt' of https://github.com/dcousens/sha.js

I thought this was merged, but was confused because this pull request had two commits with the same message.

Author: dominictarr