Some changes for assembla task #186.