Merge pull request #52 from terracoin/master