Fix issue #34

+ Tests running