Fix #49 and enter TODO regarding implementing automatic ping