Initial stuff
Merge pull request #2 from Vandenn/master

Initial stuff