Brian's first revision
Merge pull request #1 from tmass/brian

Brian's first revision