Added test
Added form
Merge remote-tracking branch 'tom/master'