Merge rebased on latest commits by
Add explicit credits
Make the UI a lot less sucky !