commit from OU
Merge branch 'master' of git://github.com/siyuan808/stratosphere