Merge for Transfer

Please merge in my changes so that I can delete my fork and you can transfer the repo to me.