first dev commit
Merge pull request #1 from barif/dev

merge