Changes done
Merge pull request #147 from Qwinix/issue_145

Changes done