Merge pull request #6 from stefandisch/master