resolved conflicts
Merge pull request #63 from power9/master

resolving confl