first commit
Merge pull request #1 from markul/dev

first commit