New approach
Merge pull request #3 from deian/master

New approach