Merge pull request #15 from moqui/master

Upstream update