Simplified pause logic. Fixed #5
Merge branch 'develop' into feature/unit-tests