i made some changes
Merge branch 'master' into changes
Merge pull request #6 from thisislorne/changes

Changes