Merge pull request #1 from crnixon/master

Updating setup and README