#6 added contextual_help
#6 resolved conflicts