issues resolved
merge babul code and Latest Commit