Fixed #40 - modal popup now requires good user input to continue
Merge branch 'Katlyn'