Merge pull request #1 from iron-io/master

Update