Issue #6 fixed

Issue #6 was fixed along with the other similar on-logged issues.