[ljubljana 2014] late proposal from Jose Roca
Merge pull request #691 from extraordinaire/master

[ljubljana 2014] late proposal from Jose Roca