Merge pull request #7 from duckwork/master