Issue#8, Issue#9 fixed + minor tweaks