Issue31

Pull request for issue #31.

Florent