Merge pull request #3 from CruWeb/dev

Dev
Fixing upstream names
Good for the moment
Mergeing dev
New Header