Merge pull request #1 from olivier-squid/master

Initial commit
fun