Merge pull request #2 from ghuitster/master

David