Merge pull request #11 from sssonline/master

11
Merge pull request #51 from moqui/master

Upstream update
Small exception text change, add hash to be consistent with elsewhere
Merge pull request #12 from sssonline/master

12