Closes #166
Fixes #165
Merge branch 'beberes' into develop