fixed #7 and #5