Merge pull request #16 from moqui/master

Upstream update
Merge pull request #17 from moqui/master

Upstream update
Merge pull request #18 from moqui/master

Upstream update