Merge pull request #12 from xNUTx/2.7-BETA

updating again
Merge pull request #13 from xNUTx/shoey63

Merge pull request #12 from xNUTx/2.7-BETA