Partially fix issue #113, while here add support for Date