work
work on exception catching and handling
Merge branch 'master' of https://github.com/NicoLugil/Yafa