Ongoing: Implementing enhancement issue #15