generalized some path variables
Merge remote-tracking branch 'upstream/master' into genupdate
fixed conflict
Merge pull request #27 from voisardf/genupdate

Genupdate