Some 5.1 related changes
Merge pull request #108 from RazorCore/master

More 5.1 related Stuff