committed from d1
Merge pull request #2 from Gregs1905/d1

committed from d1