Merge pull request #9 from TacoCoin/beta

Merge Master/Beta