made some changes
Merge pull request #1 from jmstan/development

this is my first pull request