Current version, some fixes in config.ini
Merge pull request #5 from mac22/master

Next fixes