Develop

Overall Updates for georg from develop to master.