- fix for issue #20, thanks @hwangj