Merge pull request #1 from rabbitfighter81/master

First pull request