Added a raw function for future compatibility
and stuff
Merging. Maybe.
Merge remote-tracking branch 'refs/remotes/origin/master'