[Issue-19] RemoveContext now correctly removes the requested context
Merge branch 'master' into dev