kikito Merge pull request #9 from JonasJurczok/patch-1