Add features #9 and #13