Merge pull request #1 from Alsuki/master

serverlet
Merge pull request #3 from edson20131779/master

Merge pull request #1 from Alsuki/master