Got rid of setup(), using constructor instead
Merge pull request #2 from voldyman/master

Got rid of setup(), using constructor instead