[ljubljana 2014] add proposal from Karoly Kamaras
Merge pull request #687 from extraordinaire/master

[ljubljana 2014] add proposal from Karoly Kamaras