Merge pull request #1 from richardkogelnig/patch-1