Fix #27 and slipstream/SlipStreamServer#98
Also refactored module