Add feature #159