Merge pull request #49 from moqui/master

Periodic update
Merge pull request #50 from moqui/master

Periodic update