fixed bugs
Merge branch 'master' of https://github.com/agemor/elsa

Conflicts:
	Elsa/result.n