Should fix "getTime()" issue
Merging the merge #45 from production
Merge branch 'production' of github:Alghayma/Alghayma