fix #99 + minor