fixed #22 on Github