Integration to work with the server and fixed some bug
Merge branch 'test'