Fixes #45
Fixes zas connection problems
Merge pull request #47 from d3athrow/Bleeding-Edge

Bleeding edge