Version 1.03 - Fixed bug with options