Merge pull request #45 from moqui/master

Periodic update
Merge pull request #46 from moqui/master

Periodic update