Better setup.
Merge pull request #14 from bukzor/better_setup

Better setup.