fixed #6, #8. v1.3.2