Implemented issue # 64

The tests for ini-entries I will send a separate Pull Request. Today I, unfortunately, do not have time to write them.