Changes made by Claudio Stahl (stahlclaudio@gmail.com).