Merge pull request #107 from RazorCore/master

Updated some 5.1 Handler.