Added bitcoin support
Merge branch 'develop' into staging