Added options management and other minor refactoring
Authored by: ctomasi4c 2013-08-03
Parent: [r60]
Child: [r62]