Merge pull request #8 from dtroyer/master

More updates to image scripts