Added Risk of Rain support, more to follow. at some point.
Merge remote-tracking branch 'origin/master'