#6 add method to patch existing context
fix error handling
Merge branch 'feature/6' into develop