fixed namespaces
added working Option class