Thomas version
Merge pull request #3 from tdelafosse/master

Merged the UI built by Thomas.