added better logging
Merge branch 'console.logging' into develop