Squashed commit of the following:

commit 7461279339715f5df102f60aef8b46f73ff2e820
Author: Diego Didona <didona@gsd.inesc-id.pt>
Date:   Sun Oct 6 20:56:00 2013 +0100

     * Fix

commit 59806989c89f1efbb173d7008d030d10657720de
Author: Diego Didona <didona@gsd.inesc-id.pt>
Date:   Sun Oct 6 19:58:35 2013 +0100

     * Increasing verbosity