eagle is now brown
changes
Merge branch 'master' into trial
stuff