Merge pull request #9 from TacoCoin/beta

Merge Master/Beta
Merge pull request #10 from TacoCoin/master

Merge pull request #9 from TacoCoin/beta