Merge pull request 10 (Basconero master)