Added and finished feature #18.