Added changes from Jonathan 'Wolf' Rentzsch to rentzsch branch.
8 files changed