updated readme
updates for timeout and conditions
added checking conditions
after
updated readme
Merge branch 'develop'

Conflicts:
	README.md