Merge With ShareKit/Master