Merge pull request #1 from krolow/master

Fixing problem when using multiple
Merge pull request #2 from krolow/0.1

Merge pull request #1 from krolow/master