#66 Added option and logic in main