Merge pull request #75 from power9/master

resolved conflicts
Merge pull request #76 from COPPER-BOBCAT/staging

Merge pull request #75 from power9/master