Merge pull request #5 from nubs/master

Updates to get closer to full RPC