Added support for Clusters. Updated code to support XCode6-Beta5.