Apply changes from working mGSD to github;
continue work in github