Add functionality as discussed in #66