added exeptions
Merge branch 'master' of github.com:opicak/pa165