merge
Merge of GeekSoc/gas-client to master