Merge pull request #14 from TacoCoin/beta

Fix list
Merge pull request #15 from TacoCoin/master

Merge pull request #14 from TacoCoin/beta