* fixed #5 and #6