added troubleshooting
merged upstream/master