Tidying up

## v0.1.0108
## for Issue #1