Put raw_input() into loop to fix #144
Merge remote-tracking branch 'upstream/master'