First commit
Merge pull request #1 from Cuel/wip1

First commit