Merge pull request #12 from xNUTx/2.7-BETA

updating again