first commit
Merge pull request #1 from Torf/dev

first commit