Refactored to use less specific object
Merge branch 'develop' of https://github.com/7drl/QuakeRL into develop