Added feature in Issue #5
Removed Debug Text