Merge pull request #1 from alexindigo/master

Made config more durable
Merge pull request #2 from alexindigo/v2.4.3

Merge pull request #1 from alexindigo/master