Merge pull request #1 from XForms/master

master refresh