simplify matters
simpler setup, avoid multiple instances
fixed typo
Merge pull request #2 from manumaticx/master

some improvements