Upated to reflect the last version (almost ready - server part to add and refactoring)