Merge pull request #79 from raistlinthewiz/develop

Fixed merkle-trees.