More reliable and faster processing
Merge pull request #1 from 1lann/master

More reliable and faster processing