Merge pull request #24 from Noltari/mcproxy-next