adding timestamps to logging
Merge branch 'master' into iss450
minor code comment update