Added alias bitcoin
Merge branch 'master' into dev

Moves local changes that were written seperately to the main branch.