Simplified parse_options to take gchar**
Simplified parse_options to take first option as argument
Merge branch 'master' into plugins