Merge pull request #1 from jtorraca/master

Basic code structure
Updated README.md
Fixed README.md