Resolve all issues addressed with Gedare to merge code
Resolve little issues to merge the with master