Alex, sorry, I got tied up in work and didn't get the chance to update the project for a while.  I got some time before the holiday and updated the code per the review comments.  Also updated against the latest changes in master.  Please take a look.  Hope to wrap this up soon since the master keeps making changes.  Thanks.