Comment on issue

The code is pretty ugly though :-(