from b1
Merge pull request #2 from aftab90/branch1

from b1