fixed #103
fixed #104
fixed #105