solved issue number #34
solved issue number #34