Update beta
Merge branch 'patch-2' of https://github.com/Wulter/test into Wulter-patch-2

Conflicts:
	beta
Merge branch 'Wulter-patch-2'