Updating from master

Trying to update my fork.  If I screw something up, someone please correct it.  :)  I've got 0 github skillz.