zingermans revamp
Merge pull request #688 from Tendrid/develop

zingermans revamp