Update 30/09/2013 WIP
Merge branch 'master' of https://github.com/nick-hu/pyintermediate