Merge branch 'master' of github.com:zerkalica/define-exceptions
fixes
fixes