Merge pull request #26 from Noltari/mcproxy-next