Merge pull request #44 from duckinator/master