Doesn't segfault as much.
Merge branch 'master' of github.com:JRoTheGeek/CS3013