Updated readme
Merge pull request #8 from origin/master#hotfix5
Updating Changelog
Merge from master

Conflicts:
	CHANGELOG.markdown