added basic form example
misc cleanup
Merge remote-tracking branch 'origin/master'