Added -geometry option and geometry variable