Merge pull request #34 from nhooyr/master

simplified code