switch to FS.Store namespace and pass options
Merge origin/master

Conflicts:
	README.md
Merge origin/master

Conflicts:
	README.md