Fixed setup parameters to fit package structure
Merge pull request #15 from nick-allen/master

Fixed setup parameters to fit package structure