Merge pull request #4 from nabilzaini/master

beta
last changes
conflict fixed
version final
The last changes
Merge pull request #2 from webNeat/master

Sync for Web service