Merge from stefanceriu/SCXcodeMiniMap master