Merge pull request #1 from thelock12/master

Benz > nat
Merge pull request #2 from NathanSanxez/master

asdfasdf