Greeley's suggestions
Merge pull request #1 from 4sight/greeley

Greeley's suggestions... thanks!!