port to 0.6 - closes #493