Add features #4 and #29