Update 20140801

I don't know what I've done... You can fell free using git diff.