The original commit came from @amazonwebservices and @trevorrowe in #579. I had to revise the commit and make sure all the test cases are passing. All credits still goes to those guys, thanks a lot!
