Merge pull request #54 from rishy/master

changed time remaining text
Merge remote-tracking branch 'upstream/master'