merging #195 by jacelys