Merge from stefanceriu/SCXcodeMiniMap