Merge pull request #2 from Glast/master

Merge.
Merge pull request #3 from zimmerst/GridAccessFix

Grid access fix
Merge pull request #95 from zimmerst/master

v1r3p5