Merge pull request #56 from amottier/ow2