updated file in dev branch
Merge pull request #1 from basamson/dev

updated file in dev branch