Issue #274 fixed 

 And ToUniversalTime() method was added to GetCalendarRowData to avoid Issue #176. All conflicts resolved.