Feature/homework 12 07 2014