Solved Issue #74

DONE :D