Fixed crash
3.1.37
Removed debug
Merge branch 'master'
Misc cleanup