Merge pull request #1 from krolow/master

Fixing problem when using multiple