Added some useful tips for debugging
Merge upstream