Merge pull request #125 from localheinz/patch-1