Merge pull request #1 from gato333/patch-1

created a nother branch on accident, pullin it back in