Merge pull request #5 from Jonbeek/master

Minor fixes
Update README.md
Start mocking out the skeleton
Merge pull request #8 from c00w/master

Start mocking out the skeleton