Use guint16 to store user ID, Add hops count to SMServer
Merge from SVN