Merge branch 'master' into develop
Merge remote-tracking branch 'upstream/develop' into feature-rpc
Merge remote-tracking branch 'upstream/develop' into feature-rpc
Closes #22 error
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'feature-rpc' into develop
Merge pull request #23 from dgikiller/develop

fixes #22