Merge pull request #12 from TacoCoin/beta

Pull
Merge pull request #13 from TacoCoin/master

Merge pull request #12 from TacoCoin/beta