Initial commit for task 2 of FMI 2012