issue #4

as tengjing's suggestion