Adding the ability to rebuild only one image
Merge branch 'feature-rebuildsingle'