Added NULL for windows/linux support.
Merge branch 'master' of ssh://github.com/Exeter-College-Game-Development/ECGame