final commit for immortalize branch, tested and ready
Merge remote-tracking branch 'remotes/origin/master'