Merge pull request #1 from peatio/master

Fixes