Pullrequest 85 + test coverage