my latest changes/additions

Sorry, JetBrains AppCode code formatter was applied, which adds some more changed lines than necessary.
This might help when seeing the diff (ignore whitspace: https://github.com/blog/967-github-secrets)