Merge pull request #20 from xNUTx/shoey63

Shoey63