Minor bugfix + cleanup
Critical bugfix
dist 0.9