added missing line break in front of multiple choice questions
Fixed 64-bit OS X build
Merge remote-tracking branch 'corristo/master'