Merge pull request #29 from RyanTaker/patch-3