added under jeff branch
Merge pull request #1 from jhorsch/jeff

added under jeff branch