Merge pull request #7 from tobiasjakobi/fixes