updated proposal
Merge branch 'master' of https://github.com/SpectreJan/GSoC2014