Updated and merged from v1.3 to v1.4

Conflicts:
	.gitignore
	CHANGELOG
	README.md