fix merge + remove hard coded address
Merge pull request #304 from JahPowerBit/multisig

fix merge + remove hard coded address