Merge pull request #11 from moqui/master

Periodic update