Merge pull request #39 from dankcushions/master