Merge pull request #10 from blockworks-foundation/partial_bug0