Merge pull request #1 from jclouds/master

Merge