Added resolution feature
Merge branch 'feature-resolution' into develop