Merge pull request #354 from rabuzarus/2206-cal-unsuported