Merge pull request #1 from massad77/master

Server added