Merge pull request #14 from dgikiller/develop

Merge JSON RPC into core