derby first commit
Merge https://github.com/didiercauvin/Derby