Merge pull request #1 from mab1290/master

pull request. I still dont understand github completely
It now does what it says it does.
Merge pull request #1 from Kingsania/master

pully pull