Merge pull request #22 from donkers/master