just commiting ... dunno what changes have been made...
Merge branch 'master' of https://github.com/ESE519/EVM-2013