Fixes #32
1110324 and 1110363
Merge branch 'master' of https://github.com/PauloGandraSousa/EAPLI_2013_PL_2DI