Fixed reconnect delay times (and improved test for this), a few internal variable name changes, incremented version number