solved issue #34

solved issue #34