v20140421 (fixes #19)