Merge pull request #1 from pentaho/master

Update