ENH minor changes
Merge pull request #34 from gmckercher/master

ENH minor changes