Mehdi Mulani - 2010-12-18

WIP patch for problem 1-4 (v0.1)