handle log directory better.
Merge branch 'develop'
testing.
Merge branch 'develop'