Merge branch 'integracion'

Conflicts:
	install.sh

Merging version 1.0.4 into master
Merge branch 'master' of git.assembla.com:faraday