devinhalladay Merge pull request #32 from Owlinated/master