Updated Pull via git merge

Integrated the changes you mentioned in the code via `git merge upstream/master`, the difference were handled by `git mergetools`. This base contains the latest updates.