DateTime issues #137
Updated version