committing
Merge branch 'smartgit'
committing from smart git