Bug 950
Merge pull request #175 from thdox/bug-950

Bug 950