fixed #7 & Thanks for @iamit for being proactive once again.