updating README.md to reflect changes to options
changing location of timeout call
fixed the demo page
Merge branch 'pr/4'

Conflicts:
	.gitignore