Fix for issue #37
Merge branch 'master' of https://github.com/Matzz/FormExtensions