Merge pull request #8 from glenwks/master

GENShYFT updates