Merge the new changes and added the new PR for PR#125 

Please review and merge