Merge pull request #19 from xfournet/IDEA-91145-trunk