Merge pull request #14 from savonarola/fix-deprecated-time-functions

Updated usage of time functions