Update from master

Add ~btc command