holman Merge pull request #96 from neuhaus/patch-1