Merge From Master

Add Heavycoin support