Added subforms
Merge pull request #772 from erwinwinder/master

Added subforms