Updating

Zabin, 

I am intending this to be a pull request to myself to merge in your latest files to my fork.  If it comes to you, just delete it.

Andy