fixed IllegalArgumentException
merged latest commits
minor fix and changes
merged image preview improvements