Bugfix
Merge branch 'newfeature'

Conflicts:
	readme.txt
Merge branch 'newfeature'

Conflicts:
	readme.txt
Commit