updated images
Merge branch 'addfeatures' into testing