v0.006 - Added option validation