Merge pull request #61 from carlosrusso/master

Pre-xmas merging of contributions