Issue 1 fixed

Yehaa! Issue fixed