Merge pull request #4 from ncarchedi/master

Bring Mr. Alvord up to speed with my changes
Merge remote-tracking branch 'upstream/master'