Updated readme and configuration
Merge pull request #10 from iltar/master

Updated readme and configuration