changed form added comment
merged conflicts with master
fixed question error