merged upstream changes
fixed regression
continue refactoring GRIFFIN
refactoring hPGe
Merge remote-tracking branch 'upstream/master'
continued refactoring HPGe
Merge pull request #12 from BillMills/master

HPGe refactoring