Implemented a smooth way of warning the user and switching back and forth between results.  Closes #154.
Merge remote-tracking branch 'origin/master'