Fixed paths and added new options for setting them
Merge pull request #36 from xenog/config-option

Fixed paths and added new options for setting them