first commit inline
Merge pull request #1 from Balmaarik/first

first commit inline