Modified to specify an end time
Merge pull request #2 from nemonium/feature/20131028

Modified to specify an end time