Fix issue that was causing exception on node 0.11 - and coincidentally making architecture a little more elegent
Release 0.1.5