arash + master merged