Fix #106
Merge branch 'devel' into feature/resource