resolves issue 116 in the 0.9.x branch