fixed #14 and closed #17