Merged pull request #130 into develop