Added support for options
Updated version