merging pull request #87 into develop branch