changed timer
Merge pull request #8 from GarrethDottin/release_1_features

changed timer