fix location bugs
add special waste
Merge pull request #24 from prt2121/master

Fix Location Bug