Bugs Resolved suggested by thotingal on github . sfd modified .