temp to save code state
fixing?
allow smaller images
Merge branch 'master' into code