cosmetic
cosmetic and logging, fixes #3
Merge branch 'merge'
All check for v0.0b