rebase web API
Merge pull request #27 from Alex-Diez/web-dev

rebase web API