Merge pull request #1 from samuel/master