ready to test server
Merge pull request #8 from fuentesdt/master

update