Housekeeping

Fix #9