fix
Merge branch 'master' of https://github.com/aentan/multiplyis

Conflicts:
	.githubsettings