Added ini file support
Many improvements to incorporate new ini file