Merge pull request #1 from codeforsanjose/master

Getting Kyle's changes.  Lots of polishing.