Revert "Merging with ronaldme:master"

Reverts mattm401/Cuber-Unity#1