Changed config parsing

Resolves #16