Basic stuff
Merge pull request #1 from Flosus/dev

Basic stuff