update in 3 files
Merge pull request #35 from bradgasser/master

update in 3 files