Issue 2 solved by tanvir