adding troubleshooting code
Merge branch 'microsoft-surface' of https://github.com/robpointmarc/pointmarc-public into microsoft-surface