Improving import.
Updated image size calculation.
Merge branch 'test' into dev