Merge pull request #281 from stepet92/mcproxy-fix