simplify code
Read ini file when parse_ini_file is disabled
Merge pull request #50 from QTSdev/master

Read ini file when parse_ini_file is disabled
controller tests
Merge remote-tracking branch 'upstream/master'