fix #24 and also fix #25
fixed typo