resolved conflicts
Merge pull request #75 from power9/master

resolved conflicts