Merge pull request #126 from localheinz/patch-2