Null checks for some string methods
Tweaks and test execution for ImageGen
Delete some temp files that are excluded by gitignore anyway
Merge pull request #18 from Jeavon/master

Tweaks to ImageGen and some null checks on 2 string methods