Merge pull request #5 from watshisface/master

marv to zig
Merge pull request #3 from pivotaccess2007/master

Merge pull request #5 from watshisface/master