Compare commits

...
A pull request between these branches already exists: iotishnik/server#25

dev-nm17-2 #25