gionn/etc — pull request #2 by cl--l (2013-06-04 13:20:32+00:00)
Title: Here some flexibility added

Review it, please.