hi
Merge branch 'master' of https://github.com/millerjs/Stratosphere

Eric's Changes
Final edits