updating documentation
Merge branch 'master' into 20140207

Conflicts:
	README.md