Added more code to support aliases.
Merge branch 'develop' of github.com:JamesSwift/ImageManager into develop