alu0100611120/prct08 — pull request #2 by alu0100611120 (2013-11-07 13:17:10+00:00)
Title: Merge Online

Merge 'ivan' and 'master'