Merge pull request #100 from rvandermeulen/bug-756740