Fix for images without extension
Fix for commented input commands
Merge