Marco Rodrigues - 2015-03-12

The solution is on bug #127.