fixed #24 fixed #23