Simplified proxy implementation
Merge branch 'master' of github.com:choefele/CCHMapClusterController