Merge pull request #1 from bsclifton/master

WOW. Lots of changes!