Replaced old style except, error with new style except as error
Merge branch 'feature/cleanup' into develop
Merge pull request #2 from shidarin/feature/cleanup

Feature/cleanup
Merge branch 'master' into develop