Merge pull request #138 from SenseiKiwi/master

Various Updates
Merge pull request #139 from SenseiKiwi/master

Various Fixes
Merge pull request #141 from SenseiKiwi/master

Minor Change
Merge pull request #142 from SenseiKiwi/master

Various Small Changes
Merge pull request #143 from SenseiKiwi/master

Various Updates
Merge remote-tracking branch 'upstream/master'