[Portland 2013] Nikolaos Katsimpras proposal
Merge pull request #556 from webframp/Nikolaos-Katsimpras

[Portland 2013] Nikolaos Katsimpras proposal