updated to mater branch

merged the changes to the master branch as requested