Adding missing config.ini
bugfixes to user input and flag handling
Merge branch 'development'
merging changes from development