taking out a bad exit;
Merge branch 'develop'

* develop:
  taking out a bad exit;