Issue100 context strings

This is an update of AGL's PR #100