closes #84, closes #85
Merge branch 'develop' of https://github.com/xnova/counterwallet into develop