For Brian
Merge branch 'develop' of github.com:bmael/ReallySweetSadistic into develop