From my class 28th March 2014. My work is on dev branch