Jon issue 289

This is great!