Merge pull request #76 from richard-willowit/version70

Commit for better deployment with Pentaho 5.