some changes
Merge pull request #1 from jrkirby/master

some changes