Fix issue #28 polish