Updated source setup
Merge pull request #7 from jrieke/update_setup

Updated source setup