towards better logging
Merge branch 'develop' into logging
incorporate logger
Merge branch 'logging' into develop