Merge pull request #6 from atz/master