v20140615 (fixes #26)