Merge pull request #33 from dankcushions/master