start work osti
Merge pull request #1 from stecyr/feature-git

start work osti