merge with faenzaflattr 1.1.4