bug 1065074
Merge pull request #97 from errietta/bug1065074

bug 1065074