Revert..!

I lost some changes that I made hopefully this gets them back
Merge pull request #5 from avandenheuvel/apv2

revert to server