Merge branch 'amit'
Merge branch 'master-github'