Safe imaging added
Merge branch 'safe_recieve'