Merge pull request #51 from moqui/master

Upstream update