Merge pull request #223 from tempo22/D7