closed #35
Merge branch 'feature/35-cancellation-exception-handling' into dev