Fixing merging problems and getting pull request
Merge remote-tracking branch 'origin/master'