some random stuff
improve exception handling
Merge branch 'master' of github.com:asiekierka/endernet