Merge pull request #1 from XForms/master

master refresh
Merge pull request #182 from MitchMilam/master

Merge pull request #1 from XForms/master