Bugfix106

Fixes bugs introduced with 1.0.6 - boouuuhh. ;)
@kalbermattenm : If you wan't to have a look... no major modification.