Major update - June 12, 2013
Several additional question types added and tested.