Merge branch 'issues/132' into develop