some changes
Merge branch 'amogh' into alse