second commit scaled down
Merge pull request #5 from KackieM/master

second commit scaled down