Merge pull request #1 from warheart6/master

Can I get this?
Testing