Merge branch 'master' of https://github.com/mojtabacazi/CSJSONRPC

Signed-off-by: Mojtaba Cazi <mojtabacazi@gmail.com>
Merge branch 'master' of https://github.com/mojtabacazi/CSJSONRPC