Fix issue/feature request #2
demo: http://public-storm.internetcollaboratif.info/static/storms.html