Develop

Overall Updates for georg from develop to master.
replace with latest version of function