Here is a pull request for the newest code

Sat. feb 23