Long forgotten changes
Merge branch 'master' of https://github.com/deep-concern/wyfistudios