Solved issue-618
Solved issue-618 updated for coding style
Solved issue-618 updated for coding style
Merge pull request #626 from adibranescu/issue-618

Solved issue-618