Nice- this probably closes #256.