context support

Just suggestion for #42