Merge branch 'sergiokiselev-master'
Change code language to c from c++, move client functions from main