Client functions
Merge branch 'sergiokiselev-master'