A little bit re-work of GH#251.
A little bit re-work of GH#251.

rafl/App-perlbrew,Asuza/App-perlbrew,ptolemarch/App-perlbrew,dagolden/App-perlbrew,josl/App-perlbrew,dagolden/App-perlbrew,calid/App-perlbrew,ptolemarch/App-perlbrew,Asuza/App-perlbrew,Asuza/App-perlbrew,rafl/App-perlbrew,rafl/App-perlbrew,josl/App-perlbrew,calid/App-perlbrew,ptolemarch/App-perlbrew,josl/App-perlbrew