Merge pull request #5 from watshisface/master

marv to zig