Added user context to dispatch, relates to issue #113
Merge branch 'origin/develop'