Silex branch

Hey Joe, this is a pull request!