add *******
Merge branch 'master' of https://github.com/mstfs/s2

Conflicts:
	README.rdoc