Merge pull request #13 from Silex/develop

Clean up files