Should fix "getTime()" issue
Merging the merge #45 from production