Merge pull request #182 from MitchMilam/master

Merge pull request #1 from XForms/master
Merge pull request #2 from XForms/master

Merge pull request #182 from MitchMilam/master