Here are my changes

Just overrite the cs files in your project and it should work