on Develop

Fix issue 160 pull request