Merge pull request #174 from fsb4000/forms