Been looking for something like this for a while, +1 for adding support for options.