modified some bugs...
Merge branch 'master' of https://github.com/shinji071/PyCon2014