Merge remote-tracking branch 'origin/master'

Conflicts:
	readme.txt

Signed-off-by: ehpauto <ehp.auto@gmail.com>