added comments
Merge branch 'init'