Merge pull request #77 from Noltari/mcproxy-next