Issue #11 fixed + small tweaks