Merge pull request #34 from Silex/master

Fix forgotten leftovers when renaming
Update README to reflect renaming