fixed #23 & #24