* Applied patch from Andrei Popescu <andreimpopescu@gmail.com> to add a