first commit from ativ
Merge branch 'master' of https://github.com/ativgreen/first