Adding same code as earlier today (after changes by James)
Merge pull request #39 from thortek/roo-empty-form2

Adding same code as earlier today (after changes by James)