partial for flatimage list
resolving conflicts
Merge pull request #19 from deuxio/polish

partial for flatimage list