introduced OperationContext, fixes #175
Merge pull request #177 from fluxtah/master

OperationContext + Refactor