Merge options and kwargs (code cleanup)
Remove 'autodetect' option (replaced by none/default behaviour)
Add episode special support