Feature #72 closed!