merged changes from silex-users