pull changes from AZ single pixel camera

This is to avoid the unnecessary figures that were added to the pull
request.
Merge branch 'SPC_merge' into develop