Merge pull request #19 from TacoCoin/beta

Merge pull request #18 from TacoCoin/master
Merge pull request #20 from TacoCoin/master

Merge pull request #19 from TacoCoin/beta