Added multiple image type support and file load

cf https://github.com/nmehost/waxe/issues/2