Done features #84 and #91.