Trying to debug why server is dying.
Merge pull request #299 from jaredbischof/master

Trying to debug why server is dying.