Tamago Summer 2013 project.
Merge branch 'master' of https://github.com/erasimos/tamagos13.git