Merge pull request #2 from open-power/master

Bringing fork up to date