changed calendar class,  fix for Issue #147

changed calendar class,  fix for Issue #147