feature #66