added after() method to time
Merge remote-tracking branch 'origin/master'