Merge from master

Add Heavycoin support