Adding mlamure author reference
Merge branch 'master' of https://github.com/mlamure/test

Conflicts:
	readme.txt