Merge pull request #16 from WinterBall/BenzBranch

Benz branch
Merge pull request #17 from WinterBall/master

Merge pull request #16 from WinterBall/BenzBranch