Merge branch 'master' into develop/cuda
removed unnecessary functions for further development