fixed #15
Merge branch 'master' of https://github.com/askmike/bitstamp