exceptions done
Merge branch 'master' of github.com:lindstroem/TAPY