Copy of Adi's commit

No changes from before...
Merge branch 'master' of https://github.com/dcheng-id/AdiJungLookHere
Revert "Minor bug fixes"

This reverts commit 569aadf5639a0691741dffe6c6124dde8671f968.