Some changes
Merged changes

Merge branch 'master' of https://github.com/c5sire/quipu

Conflicts:
	.gitignore
	DESCRIPTION