Merge pull request #27 from steffendietz/master