Initial commit
Bug fixs
Fixs to the Options Page
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
readme updated