fixed #23
fixed #24
solved #25