Few fixes for #107
Merge branch 'feature-rop' into develop