fixes (#29)
Merge remote-tracking branch 'origin/cleanup' into cleanup