Looks like some things changed since I forked

Hi Lester, 

Looks like you wont' want to overwrite all the differences. Let me know what to update.