Here is a commish I made a few weeks ago, hope you guys enjoy n_nClean version attached inside the RAR file.