first changes
Merge pull request #1 from dcgudeman/master

first changes
merge 1