Some code things

that.
Merge branch 'master' of https://github.com/JPWS2013/PoE_F2013