conflicts resolved
Merge pull request #1601 from mitraj/dev-branch

conflicts resolved