Changed soft title, some git testing
Merge remote-tracking branch 'upstream/master'
Some minor fixes
Merge remote-tracking branch 'upstream/pr/10'