Version 1.02 - Fixed bugs with options