Adding Timer and abandon functionality
removing magic numbers.
Commit for 1.0.0
Merge branch 'develop'

Conflicts:
	README.md