Fixes to pass test suite
Merge pull request #1 from brunopostle/master

Fixes to pass test suite. GPIndi should probably be eliminated. Many thanks for the changes.