Merge of code make by vinicius with webservice project