Merge pull request #1 from ibm-cloud/master

Pull new changes from master
Merge pull request #20 from binzu/master

Merge pull request #1 from ibm-cloud/master