Added form - fixes #3