Finishing touch, fixes #6, fixes #26