updated with recent changes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
Merge pull request #8 from olivier-squid/master

updated with recent changes