Embedded lock in to server struct
Merge pull request #33 from voldyman/master

Embedded lock in to server struct