Merge pull request #21 from grimd34th/master