Alternative implementation
Merge pull request #6 from christian-marie/master

Alternative implementation